missions page layout fix
2 changed files with 17 additions and 13 deletions
+ 5
- 5
app/controllers/missions_controller.rb
@@ -4,11 +4,11 @@ class MissionsController < ApplicationController |
||
| 4 | 4 |
# GET /missions |
| 5 | 5 |
# GET /missions.json |
| 6 | 6 |
def index |
| 7 |
- #@featured_missions = Mission.where("status = ? OR status = ?", 1, 2).last
|
|
| 8 |
- #@open_missions = Mission.where("status = ? OR status = ?", 1, 2)
|
|
| 9 |
- #@open_missions.delete_if { |m| m == @featured_missions }
|
|
| 10 |
- #@finished_missions = Mission.where("status = ? OR status = ?", 3, 4)
|
|
| 11 |
- #@finished_missions.delete_if { |m| m == @featured_missions }
|
|
| 7 |
+ @featured_missions = Mission.where("status = ? OR status = ?", 1, 2).last
|
|
| 8 |
+ @open_missions = Mission.where("status = ? OR status = ?", 1, 2)
|
|
| 9 |
+ @open_missions.delete_if { |m| m == @featured_missions }
|
|
| 10 |
+ @finished_missions = Mission.where("status = ? OR status = ?", 3, 4)
|
|
| 11 |
+ @finished_missions.delete_if { |m| m == @featured_missions }
|
|
| 12 | 12 |
end |
| 13 | 13 |
|
| 14 | 14 |
def mission_control |
+ 12
- 8
app/views/missions/index.html.erb
@@ -46,21 +46,25 @@ |
||
| 46 | 46 |
|
| 47 | 47 |
|
| 48 | 48 |
<% if @open_missions != nil %> |
| 49 |
- <%= content_tag(:h2, (t 'mission.open_missions'))%> |
|
| 49 |
+ <% if @open_missions.count > 2 %> |
|
| 50 |
+ <%= content_tag(:h2, (t 'mission.open_missions'))%> |
|
| 50 | 51 |
|
| 51 |
- <%= content_tag(:ul, class: 'thumbnails mission-list') do %> |
|
| 52 |
- <% @open_missions.each do |mission| %> |
|
| 53 |
- <%= render partial: "mission_box", locals: {mission: mission} %>
|
|
| 52 |
+ <%= content_tag(:ul, class: 'thumbnails mission-list') do %> |
|
| 53 |
+ <% @open_missions.each do |mission| %> |
|
| 54 |
+ <%= render partial: "mission_box", locals: {mission: mission} %>
|
|
| 55 |
+ <% end %> |
|
| 54 | 56 |
<% end %> |
| 55 | 57 |
<% end %> |
| 56 | 58 |
<% end %> |
| 57 | 59 |
|
| 58 | 60 |
<% if @finished_missions != nil %> |
| 59 |
- <%= content_tag(:h2, (t 'mission.finished_missions'))%> |
|
| 61 |
+ <% if @finished_missions.count > 2 %> |
|
| 62 |
+ <%= content_tag(:h2, (t 'mission.finished_missions'))%> |
|
| 60 | 63 |
|
| 61 |
- <%= content_tag(:ul, class: 'thumbnails mission-list') do %> |
|
| 62 |
- <% @finished_missions.each do |mission| %> |
|
| 63 |
- <%= render partial: "mission_box", locals: {mission: mission} %>
|
|
| 64 |
+ <%= content_tag(:ul, class: 'thumbnails mission-list') do %> |
|
| 65 |
+ <% @finished_missions.each do |mission| %> |
|
| 66 |
+ <%= render partial: "mission_box", locals: {mission: mission} %>
|
|
| 67 |
+ <% end %> |
|
| 64 | 68 |
<% end %> |
| 65 | 69 |
<% end %> |
| 66 | 70 |
<% end %> |